Tobacco and non-tobacco e-liquid flavors